[LINUX] Make sure to initialiase the xen features bitmap before first use on x86_64.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
index 356c0717ff57cc7ccf58a239e677c2ea8e9b335f..a9dab81cd01b5b61ffbaa7f6ed16b73e1088990b 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
@@ -104,6 +104,8 @@ void __init x86_64_start_kernel(char * real_mode_data)
        char *s;
        int i;
 
+       setup_xen_features();
+
        xen_start_info = (struct start_info *)real_mode_data;
        if (!xen_feature(XENFEAT_auto_translated_physmap))
                phys_to_machine_mapping =

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
index 22164fb524cbd0892c029f01721a6d02ba26ed1d..2e6552859ea221710f0cbc777182e132cfffadac 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
@@ -625,8 +625,6 @@ void __init setup_arch(char **cmdline_p)
 
 #endif
 
-       setup_xen_features();
-
        HYPERVISOR_vm_assist(VMASST_CMD_enable,
                             VMASST_TYPE_writable_pagetables);